[XEND] Change blkif to use the new style configuration

Signed-off-by: Alastair Tse <atse@xensource.com>

diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py
index 927e062e118d09b71183a51e150c9d9cfb45ffa2..d6e449e337831ab4870349bbbbb44d7559f3f9a8 100644 (file)
--- a/tools/python/xen/xend/server/blkif.py
+++ b/tools/python/xen/xend/server/blkif.py
@@ -16,7 +16,6 @@
 # Copyright (C) 2005, 2006 XenSource Inc.
 #============================================================================
 
-
 import re
 import string
 
@@ -24,10 +23,8 @@ from xen.util import blkif
 from xen.util import security
 from xen.xend import sxp
 from xen.xend.XendError import VmError
-
 from xen.xend.server.DevController import DevController
 
-
 class BlkifController(DevController):
     """Block device interface controller. Handles all block devices
     for a domain.
@@ -38,12 +35,10 @@ class BlkifController(DevController):
         """
         DevController.__init__(self, vm)
 
-
     def getDeviceDetails(self, config):
         """@see DevController.getDeviceDetails"""
-        uname = sxp.child_value(config, 'uname')
-
-        dev = sxp.child_value(config, 'dev')
+        uname = sxp.child_value(config, 'uname', '')
+        dev = sxp.child_value(config, 'dev', '')
 
         if 'ioemu:' in dev:
             (_, dev) = string.split(dev, ':', 1)
@@ -74,6 +69,10 @@ class BlkifController(DevController):
                  'mode'   : mode
                }
 
+        uuid = sxp.child_value(config, 'uuid')
+        if uuid:
+            back['uuid'] = uuid
+
         if security.on():
             (label, ssidref, policy) = security.get_res_security_details(uname)
             back.update({'acm_label'  : label,
@@ -105,27 +104,30 @@ class BlkifController(DevController):
                           (self.deviceClass, devid, config))
 
 
-    def configuration(self, devid):
-        """@see DevController.configuration"""
-
-        result = DevController.configuration(self, devid)
-
-        (dev, typ, params, mode) = self.readBackend(devid,
-                                                    'dev', 'type', 'params',
-                                                    'mode')
+    def getDeviceConfiguration(self, devid):
+        """Returns the configuration of a device.
 
+        @note: Similar to L{configuration} except it returns a dict.
+        @return: dict
+        """
+        config = DevController.getDeviceConfiguration(self, devid)
+        devinfo = self.readBackend(devid, 'dev', 'type', 'params', 'mode',
+                                   'uuid')
+        dev, typ, params, mode, uuid = devinfo
+        
         if dev:
-            (dev_type) = self.readFrontend(devid, 'device-type')
+            dev_type = self.readFrontend(devid, 'device-type')
             if dev_type:
-                dev += ":" + dev_type
-            result.append(['dev', dev])
+                dev += ':' + dev_type
+            config['dev'] = dev
         if typ and params:
-            result.append(['uname', typ + ":" + params])
+            config['uname'] = typ +':' + params
         if mode:
-            result.append(['mode', mode])
-
-        return result
+            config['mode'] = mode
+        if uuid:
+            config['uuid'] = uuid
 
+        return config
 
     def destroyDevice(self, devid):
         """@see DevController.destroyDevice"""